File list views in navigation history
4 changed files with 25 additions and 10 deletions
+ 8
- 6
app/scripts/controllers/app-ctrl.js
@@ -32,7 +32,8 @@ angular.module('codexApp.index', [])
|
||
| 32 | 32 |
$rootScope.$broadcast('footer:info', info);
|
| 33 | 33 |
break; |
| 34 | 34 |
case "Notebook": |
| 35 |
- $scope.files = FileService.getFiles($scope.current_folder); |
|
| 35 |
+ $scope.files = FileService.getFiles(FileService.getCurrentNote().path); |
|
| 36 |
+ |
|
| 36 | 37 |
var info = $scope.files.length + " Items" |
| 37 | 38 |
$rootScope.$broadcast('footer:info', info);
|
| 38 | 39 |
break; |
@@ -58,6 +59,7 @@ angular.module('codexApp.index', [])
|
||
| 58 | 59 |
break; |
| 59 | 60 |
case "Folder": |
| 60 | 61 |
$scope.current_folder = file.path; |
| 62 |
+ FileService.setCurrentNote(file) |
|
| 61 | 63 |
PrefsService.setCurrentView("Notebook");
|
| 62 | 64 |
$scope.setView(); |
| 63 | 65 |
break; |
@@ -103,11 +105,11 @@ angular.module('codexApp.index', [])
|
||
| 103 | 105 |
$scope.itemSpacing = function(){
|
| 104 | 106 |
//var html_items = document.getElementsByClassName("file-view-item");
|
| 105 | 107 |
//var items = [].slice.call(html_items); |
| 106 |
- var items = HTMLNodesToArray('grid', 'li');
|
|
| 107 |
- for (var i = 0; i < items.length; i++) {
|
|
| 108 |
- items[i].style.margin = "55px"; |
|
| 109 |
- console.log(item[i]); |
|
| 110 |
- } |
|
| 108 |
+ // var items = HTMLNodesToArray('grid', 'li');
|
|
| 109 |
+ // for (var i = 0; i < items.length; i++) {
|
|
| 110 |
+ // items[i].style.margin = "55px"; |
|
| 111 |
+ // console.log(item[i]); |
|
| 112 |
+ // } |
|
| 111 | 113 |
} |
| 112 | 114 |
|
| 113 | 115 |
$scope.isImage = function(file_type) {
|
+ 2
- 2
app/scripts/controllers/header-ctrl.js
@@ -50,7 +50,7 @@ angular.module('codexApp.header', [])
|
||
| 50 | 50 |
$rootScope.$broadcast('window-view:change');
|
| 51 | 51 |
FileService.goToPreviousNote(); |
| 52 | 52 |
$rootScope.$broadcast('note-view:reload');
|
| 53 |
- $state.go("note-view");
|
|
| 53 |
+ FileService.changeController(); |
|
| 54 | 54 |
} |
| 55 | 55 |
|
| 56 | 56 |
// Go to the next note |
@@ -58,7 +58,7 @@ angular.module('codexApp.header', [])
|
||
| 58 | 58 |
$rootScope.$broadcast('window-view:change');
|
| 59 | 59 |
FileService.goToNextNote(); |
| 60 | 60 |
$rootScope.$broadcast('note-view:reload');
|
| 61 |
- $state.go("note-view");
|
|
| 61 |
+ FileService.changeController(); |
|
| 62 | 62 |
} |
| 63 | 63 |
|
| 64 | 64 |
// Note View active button |
+ 2
- 1
app/scripts/controllers/sidebar-ctrl.js
@@ -8,7 +8,7 @@ |
||
| 8 | 8 |
* Controller of the domainManagerApp |
| 9 | 9 |
*/ |
| 10 | 10 |
angular.module('codexApp.sidebar', [])
|
| 11 |
- .controller('SidebarCtrl',['$scope', '$rootScope', '$state', 'PrefsService', function ($scope, $rootScope, $state, PrefsService) {
|
|
| 11 |
+ .controller('SidebarCtrl',['$scope', '$rootScope', '$state', 'PrefsService', "FileService", function ($scope, $rootScope, $state, PrefsService, FileService) {
|
|
| 12 | 12 |
|
| 13 | 13 |
console.log('-> Sidebar loaded')
|
| 14 | 14 |
|
@@ -31,6 +31,7 @@ angular.module('codexApp.sidebar', [])
|
||
| 31 | 31 |
} |
| 32 | 32 |
|
| 33 | 33 |
$scope.goToNotebooks = function() {
|
| 34 |
+ FileService.setCurrentNote(FileService.getNote(FileService.getNotesDir())); |
|
| 34 | 35 |
PrefsService.setCurrentView("Notebooks");
|
| 35 | 36 |
$scope.activateSidebarBtn(2); |
| 36 | 37 |
$rootScope.$broadcast('main-window:file-list');
|
+ 13
- 1
app/scripts/services/file-service.js
@@ -1,5 +1,5 @@ |
||
| 1 | 1 |
angular.module('codexApp')
|
| 2 |
-.service('FileService', [ '$rootScope', '$http', 'ThumbnailService', function($rootScope, $http, ThumbnailService) {
|
|
| 2 |
+.service('FileService', [ '$rootScope', '$http', 'ThumbnailService', '$state', function($rootScope, $http, ThumbnailService, $state) {
|
|
| 3 | 3 |
|
| 4 | 4 |
var notes_dir = "/Users/james/dev/codex/codex"; |
| 5 | 5 |
var default_notes_dir = "/Users/james/dev/codex/codex/inbox"; |
@@ -443,6 +443,7 @@ angular.module('codexApp')
|
||
| 443 | 443 |
note_history_index = note_history_index - 1; |
| 444 | 444 |
current_note = note_history[note_history_index]; |
| 445 | 445 |
} |
| 446 |
+ console.log(current_note); |
|
| 446 | 447 |
} |
| 447 | 448 |
|
| 448 | 449 |
this.goToNextNote = function(){
|
@@ -464,4 +465,15 @@ angular.module('codexApp')
|
||
| 464 | 465 |
return getNote(default_home_note); |
| 465 | 466 |
} |
| 466 | 467 |
|
| 468 |
+ this.changeController = function(){
|
|
| 469 |
+ switch (current_note.type) {
|
|
| 470 |
+ case "Markdown": |
|
| 471 |
+ $state.go("note-view");
|
|
| 472 |
+ break; |
|
| 473 |
+ case "Folder": |
|
| 474 |
+ $state.go("index");
|
|
| 475 |
+ break; |
|
| 476 |
+ } |
|
| 477 |
+ } |
|
| 478 |
+ |
|
| 467 | 479 |
}]) |